Autogenerated HTML docs for v1.8.4-357-g8d83
diff --git a/git-merge-tree.txt b/git-merge-tree.txt index c5f84b6..58731c1 100644 --- a/git-merge-tree.txt +++ b/git-merge-tree.txt
@@ -13,7 +13,7 @@ DESCRIPTION ----------- -Reads three treeish, and output trivial merge results and +Reads three tree-ish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way 'git read-tree -m' does, but instead of storing the results in the index, the command outputs the entries to the
